From 99280a4af4eae8ec995fb16d1115229511186690 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 7 Dec 2006 11:43:19 +0000 Subject: [PATCH] Remove unused KEXEC_RANGE_VA_XEN. KEXEC_RANGE_VA_XEN is currently unused and there is no point in exporting it. Signed-Off-By: Magnus Damm --- Applies to xen-unstable-12756 xen/common/kexec.c | 13 +++---------- xen/include/public/kexec.h | 3 +-- 2 files changed, 4 insertions(+), 12 deletions(-) --- xen/common/kexec.c | 13 +++---------- xen/include/public/kexec.h | 3 +-- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/xen/common/kexec.c b/xen/common/kexec.c index 2f8b8e0de3..885afae80c 100644 --- a/xen/common/kexec.c +++ b/xen/common/kexec.c @@ -160,13 +160,9 @@ static int kexec_get_reserve(xen_kexec_range_t *range) extern unsigned long _text; -static int kexec_get_xen(xen_kexec_range_t *range, int get_ma) +static int kexec_get_xen(xen_kexec_range_t *range) { - if ( get_ma ) - range->start = virt_to_maddr(&_text); - else - range->start = (unsigned long) &_text; - + range->start = virt_to_maddr(&_text); range->size = (unsigned long)&_end - (unsigned long)&_text; return 0; } @@ -195,10 +191,7 @@ static int kexec_get_range(XEN_GUEST_HANDLE(void) uarg) ret = kexec_get_reserve(&range); break; case KEXEC_RANGE_MA_XEN: - ret = kexec_get_xen(&range, 1); - break; - case KEXEC_RANGE_VA_XEN: - ret = kexec_get_xen(&range, 0); + ret = kexec_get_xen(&range); break; case KEXEC_RANGE_MA_CPU: ret = kexec_get_cpu(&range); diff --git a/xen/include/public/kexec.h b/xen/include/public/kexec.h index 556aaecb3d..ca6e85b701 100644 --- a/xen/include/public/kexec.h +++ b/xen/include/public/kexec.h @@ -107,8 +107,7 @@ typedef struct xen_kexec_load { #define KEXEC_RANGE_MA_CRASH 0 /* machine address and size of crash area */ #define KEXEC_RANGE_MA_XEN 1 /* machine address and size of Xen itself */ -#define KEXEC_RANGE_VA_XEN 2 /* virtual adrress and size of Xen itself */ -#define KEXEC_RANGE_MA_CPU 3 /* machine address and size of a CPU note */ +#define KEXEC_RANGE_MA_CPU 2 /* machine address and size of a CPU note */ /* * Find the address and size of certain memory areas -- 2.30.2